From b168be59be9fbaee4d593d10598e29616f6db019 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Sun, 16 Mar 2003 12:48:16 +0000 Subject: [PATCH] bitkeeper revision 1.138.1.1 (3e747290naA-qNOJaNg13FTUXkrcdw) further cleanup to domain building scripts --- tools/domain_builder/mynewdom | 13 +++++++++++-- tools/domain_builder/newdom | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/domain_builder/mynewdom b/tools/domain_builder/mynewdom index 843e603fa9..4532e6a7d2 100755 --- a/tools/domain_builder/mynewdom +++ b/tools/domain_builder/mynewdom @@ -4,6 +4,10 @@ SIZE=${1:?"size missing"} +SITE_NFS=128.232.32.20 +SITE_GW=128.232.32.1 +SITE_MASK=255.255.240.0 + shift; ARGS="$*" @@ -26,6 +30,11 @@ LOOKUP=`host $NEWADDR` echo $LOOKUP | grep 'domain name pointer' && NEWNAME=`echo $LOOKUP | sed -e 's!.*domain name pointer \([^ ]\+\).$!\1!'` echo New IP address : ${NEWADDR} name : ${NEWNAME} +#SITE_GW=`netstat -rn|while read a b c;do case "$a" in 0.0.0.0)echo "$b";;esac;done` + +IP_CONFIG="ip=${NEWADDR}:${SITE_NFS}:${SITE_GW}:${SITE_MASK}:${NEWNAME}:eth0:off" +echo IP_CONFIG : ${IP_CONFIG} + CMDLINE=`cat /proc/cmdline` case $CMDLINE in *root=/dev/nfs*) @@ -48,8 +57,8 @@ esac echo New root arguments : ${NEWROOT_DEV} -echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS} +echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS} -./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS} +./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS} diff --git a/tools/domain_builder/newdom b/tools/domain_builder/newdom index 3b0612638c..1961872923 100755 --- a/tools/domain_builder/newdom +++ b/tools/domain_builder/newdom @@ -16,7 +16,7 @@ shift; shift; shift echo ARGS $* -$DOM_BUILDER $SIZE $IMAGE 1 ro ip=$IP:128.232.32.20:128.232.32.1:255.255.240.0::eth0:off $* +$DOM_BUILDER $SIZE $IMAGE 1 $* DOM=$? echo DOM= $DOM -- 2.30.2